Bug 549262 – GtkScrolledWindow should not accept focus unless

2008-08-29  Matthias Clasen  <mclasen@redhat.com>

        Bug 549262 – GtkScrolledWindow should not accept focus unless
        GTK_CAN_FOCUS is set

        * gtk/gtkscrolledwindow.c (gtk_scrolled_window_focus): only grab the
        focus, if GTK_WIDGET_CAN_FOCUS() returns TRUE. Patch by Sven
        Herzberg

svn path=/trunk/; revision=21233

diff --git a/ChangeLog b/ChangeLog
index b84bea329105f031755cdfd0e8953c752d47465b..b3f5e74a0a41bbd95fdc81066f327fbf1814a3f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-29  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 549262 – GtkScrolledWindow should not accept focus unless
+       GTK_CAN_FOCUS is set
+
+       * gtk/gtkscrolledwindow.c (gtk_scrolled_window_focus): only grab the
+       focus, if GTK_WIDGET_CAN_FOCUS() returns TRUE. Patch by Sven 
+       Herzberg
+
 2008-08-29  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtk.symbols:

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 78f11102951d0e17bedd494fdb753b1e4262941b..8134792a1fa27c31d48329934eecebde4bc1c4c7 100644 (file)
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -1547,7 +1547,7 @@ gtk_scrolled_window_focus (GtkWidget        *widget,
        return TRUE;
     }
 
-  if (!had_focus_child)
+  if (!had_focus_child && GTK_WIDGET_CAN_FOCUS (widget))
     {
       gtk_widget_grab_focus (widget);
       return TRUE;